Feat/get detailed door access #265

pontussjostedt · 2023-11-15T14:55:54Z

Lägger till en function som tar fram alla användare, som har någon typ av individuell access. Är tänkt att användas i frontenden senare för att underlätta för syrelsen att kolla vilka som har access.

Finns ett par problem för tillfället:

Känner inte att mitt testa är särskilt bra, känns som att det borde finnas ett bättre sätt
Borde det jag gjort finns I users eller access, smått oklart?
Jag har inte uppdaterat changeloggen :)

(behöver lite feedback :))

Anledningen till att querying behövs är att styrelsen vill veta vilka de har gett individuell access till och vill inte söka igenom alla namn en efter en.

…graphql schema

github-actions · 2023-11-15T14:58:27Z

Coverage report

St.^❔	Category	Percentage	Covered / Total
🟡	Statements	67.35%	1353/2009
🔴	Branches	44.49%	218/490
🔴	Functions	57.52%	241/419
🟡	Lines	67.12%	1284/1913

Test suite run failed

Failed tests: 2/238. Failed suites: 1/19.

  ● forget a user

    thrown: "Exceeded timeout of 5000 ms for a test.
    Use jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test."

      317 | });
      318 |
    > 319 | test('forget a user', async () => {
          | ^
      320 |   const couldForget = await api.forgetUser(mockNewUser0.username); // How could you forget me?
      321 |   expect(couldForget).toBeTruthy();
      322 |

      at Object.<anonymous> (test/unit/user.api.test.ts:319:1)

  ● reset password properly

    thrown: "Exceeded timeout of 5000 ms for a test.
    Use jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test."

      329 | });
      330 |
    > 331 | test('reset password properly', async () => {
          | ^
      332 |   await api.createUser(mockNewUser1);
      333 |   const token = await api.requestPasswordReset(mockNewUser1.username);
      334 |   const newPassword = 'Detta test skrevs på valmötet 2021';

      at Object.<anonymous> (test/unit/user.api.test.ts:331:1)

Report generated by 🧪jest coverage report action from f950190

github-actions · 2023-11-15T14:59:19Z

I have deployed this PR to feat-get-detailed-door-access-ekorre.review.esek.se 🚀

Muncherkin · 2023-11-20T09:28:36Z

Fix lint and write the changelog. The tests that fail always fail so no worries there (I mean, some worries but separate issue). I'm unsure if the graph you wrote is the most useful solution. It might be more general to create an userWithIndividualAccess query that takes an optional user array as a parameter or queries all users if no user is sent as an argument. In any case, the implementation seems based and banger, do the lint and changelog fixes and consider the graph ❤️💅

src/api/user.api.ts

afroborg · 2023-11-27T19:53:40Z

test/integration/access.api.test.ts

@@ -197,6 +197,19 @@ describe('setting/getting access for user', () => {
    await setGetTest(setAccess(accessMultipleInput), getAccess, expectedAccess);
  });

+  //This seems kinda iffy
+  it('getting all access users', async () => {


might be worth adding a test that adds a individualAccess and then checks that it actually is returned, that way it keeps it more contained to that specific test

You mean that I should just check that that one user is present?
Currently 'aa0000bb' "leaks" into the test and if our seeding data ever changes it will break the test.

So do you think it would be reasonable to remove the test checking all users and instead add 2 users; one with and one without individual access. After that check so only 1 of them is returned?

afroborg · 2023-11-27T19:55:20Z

test/integration/access.api.test.ts

+
+    expect(accessUsers).toEqual(
+      expect.arrayContaining(
+        usernamesToCheck.map((username) => expect.objectContaining({ username })),


fix the linting error

afroborg

looks good, added some comments to look into. as @Muncherkin said, update the changelog and version. also fix the linting.

afroborg · 2023-12-07T17:43:56Z

src/api/user.api.ts

+   * @returns All users with individual access
+   */
+  async getUsersWithIndividualAccess(): Promise<
+    (PrismaUser & { access: PrismaIndividualAccess[] })[]


you can update the return type to use the built in prisma types:

Prisma.PrismaUserGetPayload<{ include: { access: true; }; }>[]

this way you don't have to explicitly typecast it

afroborg · 2023-12-07T17:44:13Z

src/resolvers/user.resolver.ts

@@ -145,6 +145,11 @@ const userResolver: Resolvers = {
      return reduce(users, userReduce);
    },
    numberOfMembers: async (_, { noAlumni }) => api.getNumberOfMembers(noAlumni === true),
+    usersWithIndividualAccess: async (_: unknown, __: unknown, ctx: Context) => {


remove unknown

afroborg · 2023-12-07T17:45:33Z

Update the version in package.json and package-lock.json to 1.6.0 as well

afroborg

resolve the conflicts and you are g2g

github-actions · 2023-12-12T20:55:36Z

I have removed this deploy now 😇

pontussjostedt added 9 commits October 14, 2023 15:41

adds gql schema for invidualDoorAcess and postDoorAccess

c8630cd

adds api function for getting individual access for a door

a61bcfc

Adds resolver

f1ef854

Remove additon postAccess

690db37

adds usersWithIndividualAccess

1812384

adds comment

f81518b

npm run perttier-format

ec6a9e9

remove previous additon getAccessForIndividual door for resolver and …

f3d1354

…graphql schema

added test

da769be

cleanup import

661fef6

pontussjostedt requested review from afroborg and Muncherkin November 18, 2023 11:17

afroborg reviewed Nov 27, 2023

View reviewed changes

src/api/user.api.ts Show resolved Hide resolved

afroborg reviewed Nov 27, 2023

View reviewed changes

afroborg requested changes Nov 27, 2023

View reviewed changes

pontussjostedt added 5 commits December 4, 2023 09:53

add test for allUsersWithIndividualAccess

791beb8

remove garbage test

fb0ed39

remove unused import

e240254

update changelog

1b9e778

fixade .env.example

1af0f66

pontussjostedt requested a review from afroborg December 4, 2023 09:29

pontussjostedt added 2 commits December 4, 2023 11:35

add comment

729c88d

generate and fix typecast

e79d499

afroborg reviewed Dec 7, 2023

View reviewed changes

pontussjostedt added 2 commits December 7, 2023 18:58

update package.json version

e382f75

update package.lock

8f9b298

afroborg mentioned this pull request Dec 7, 2023

Add AHS access type #267

Merged

change return type

71a8e20

pontussjostedt requested a review from afroborg December 8, 2023 14:15

afroborg approved these changes Dec 12, 2023

View reviewed changes

Merge branch 'main' into feat/get-detailed-door-access

f950190

pontussjostedt merged commit 6b5e0ba into main Dec 12, 2023
6 of 7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/get detailed door access #265

Feat/get detailed door access #265

pontussjostedt commented Nov 15, 2023 •

edited

Loading

github-actions bot commented Nov 15, 2023 •

edited

Loading

github-actions bot commented Nov 15, 2023

Muncherkin commented Nov 20, 2023

afroborg Nov 27, 2023

pontussjostedt Nov 27, 2023

afroborg Nov 27, 2023

afroborg left a comment

afroborg Dec 7, 2023

afroborg Dec 7, 2023

afroborg commented Dec 7, 2023

afroborg left a comment

github-actions bot commented Dec 12, 2023

Feat/get detailed door access #265

Feat/get detailed door access #265

Conversation

pontussjostedt commented Nov 15, 2023 • edited Loading

github-actions bot commented Nov 15, 2023 • edited Loading

Coverage report

Test suite run failed

github-actions bot commented Nov 15, 2023

Muncherkin commented Nov 20, 2023

afroborg Nov 27, 2023

Choose a reason for hiding this comment

pontussjostedt Nov 27, 2023

Choose a reason for hiding this comment

afroborg Nov 27, 2023

Choose a reason for hiding this comment

afroborg left a comment

Choose a reason for hiding this comment

afroborg Dec 7, 2023

Choose a reason for hiding this comment

afroborg Dec 7, 2023

Choose a reason for hiding this comment

afroborg commented Dec 7, 2023

afroborg left a comment

Choose a reason for hiding this comment

github-actions bot commented Dec 12, 2023

pontussjostedt commented Nov 15, 2023 •

edited

Loading

github-actions bot commented Nov 15, 2023 •

edited

Loading